Patch from Lorenzo to fix previous incomplete patch.
Patch from Lorenzo to fix previous incomplete patch.

traviscross/chibi-scheme,traviscross/chibi-scheme,traviscross/chibi-scheme,traviscross/chibi-scheme