REFACTOR: Added default case when everything went well
Fixed ugly overwriting bug