Fixing #17