Update according to comments with @TheBoxer