added Becca's fix
fixed merge conflict