Another nasty hack for my specific needs