fix for REV-554