Drawer issues

Fix for issue #35