A temporary hack until I figure out something better