Wokring on fixing bugs