FIX: address @arjoly comments