Initial Fix for issue-1414