Dope fix by jrmarmon