Fix for Issue#45