Fixes #1236