Fix for Issue#4