FIXED issue #5