added clunky fix using params; looking into alternatives