IMPORTANT: fixing require bugs invisible during dev