[BUGFIX] RIUS-201412191449