Fixed ezekiel's fix