initial fix for GMAVENPLUS-17