Fixing COMMONS-114