Fixing #462