added Simon's fix