Fix for Issue#42