Fixes #1248
Fixes #1248