fix to prev PR