you're right, this should be changed