Resovled issue #4