Apply #163 resolution from master. It was missing in develop branch.