Fixing Mark's shit