get rid of workaround