Fix common Controller