FIX: Fix for corner case