Follow-up on @nicolaasmatthijs' review