fix for REV-640