Add bug workaround