Fixes #260