fixes #1923 #1294