Fixing #6