fix for REV-639