Add a tacky bug workaround