fix for Issue#3