Fixed behavior for forwarding on extend.