Attempt to fix forwarding issue introduced in 0.1.3