shelf bug workaround