Fix for Issue#556