Fix for Issue#44