Fixed issue #1 :lemon: