Slight edit to @BernhardKonrad's chnages