Fix for Issue-006