Issue 2 bug fixed