Changes for issue-440