This should fix things for now. Nasty DRY violation though.