Fixing chainsaw bug