fix for REV-626