Fixes. Issue#426