Fixed crahses for the CHANGING API WHICH IS CRIMINAL