move workaround to the right place