Fix #106 some more, as what worked on the emulator didn't in real life.