FIX: degenerate case handling