fixes #4073 #2705
#4073