fixing forwarding bug. dont know WHY it suddenly stopped working after months, but seems fine now. need to write tests for this i guess.