Make the changes suggested by @WouterJ