Possible fix for #182 drawer issue