Fixes #1309
Fixes #1309