catcall fixed, bug added