Fix #28

This code actually works in a phone, we just need to change our testing to deal with it...