Fix for Issue#49