Fixed bug issue #4