Trying to fix issue-586