some bug fixes to keep compatibility with feinCSM 1.7