Fixes #280