Tweaks for fix issue #159