Added #1286
Fixes #1287