Fixed a mistake
Merge branch 'master' into minimal

Merged fix