Changes according to the comments by Norihiro