fixes #2459 #2460