FLYING PUDDING: Fixing bugs

Fixing bugs