Fixed issue #20!