Hoepfully a fix for sjb's nil error