Fixed forwarding error and test.