(Hopefully) fixed for Spot's API