FIX: Remove when