Update according to the comments by Nori