Fixes #390
Merging.