Masato's fix