Bug fixed in master's hotfix branch