Adjust for @daschl's comments