more aggressive bug workaround for testing