Fixes #967