Fix as per nereid changes