Fixed that sneaky race condition with an evil hack