FIX: More liberal check