fix for GMAVENPLUS-12