Demetra Fries lock-fix5784