Horrible hack, but let's try this anyway