fix for REV-526