Stuff to try and fix command issue