Make change suggested by @SAPlayer