Cloud Bug Fixed and Catcher Bug Fixed