Fixing bug
finalizing