two bug fixes to be included in patched version 1.1