fixes issue-3225