fix for issues REV-552 and REV-553