Fix for Drawer

Fix for Drawer