Fixing bug and ticking version