Fixed simon freak out
Fixed simon freak out