Fix for Issue#19