FIX: Don't always create an `itemController`