FIX: superfluous check