fixes #2037 #2038