Fixed @WouterJ's feedback