Fixing issue #6. Behaviour is changed.