Fixed weirdness...