anti-pattern temp fixes :)