remove my workaround