otb classes fixed