Temporary fix... I'm pretty sure this a API bug