fix for REV-717