Fix from last commit's conflicts