solved issue #5