Same suggestion in v1.4 patch