Fixes #287