Change based on comments of @mgold and @jvoigtlaender