Updated bug fix of issue #4