Fix both