Revert "Revert "fixed a bit""

This reverts commit 177035a42f0303c54f7629735eaa816e754399f8.