Fixed broken forwards reported by Patrik Stridvall.