Fix/1287

- [x] Fixes #1287