fix for REV-638