FIX: Fix discont warning