30.12.19:45 fixing bug