Fix for Issue#426