old dirty hack

jactry is working on a real fix