version -04, fixes for ticket #118