line 221 fix, portability improvements