Try to get this working with older 0xfaded/eval code until this is fixed to work with current code