Fix by comments