A bit of a hack... Please don't sue me!