follow suggestions by Eelco