Bug Fixes, punch block.