FIX: address @arjoly and @larsmans comments