Fix chanawut's bug