This needs to be resolved asap