Dylan's fix. GOD HELP ME!