Fix for Issue#24