Fixes #290