Fixing problem with forward.

Closes #825