Fix regarding to @ready4god2513 comment