Fix Stephen bug #9