Fix after comments by @jlipps