Fix for Issue#56