when and if this gets fixed maybe also add guests code too