Fix for ISSUE#17