[1.2.0] Took @WouterJ feddback into account