Yamaki class fixed