added more workaround