one more bug workaround