Small bug workaround