Removing temp fix in api, will be attended later