Fixes #278