Fix for Issue#50