Fix for special case