return to uglier hack for gcalc