Merged shalma's fix for Dancing Blocks (Sachen)
Fix for mapper 146