hopefully this will make things a bit more reliabl