minor fix, still untested