Small change to make the implementation more elegant