Fixed Marvin's Error