Fix for piston traps in 1.5. Issue #121