Fixes for PR #92 , #93