-- fixed strict warnings for GEP-58