Hotfix for issue-7