removed workaround flag