Bug workaround