Fix the underlying bug, remove champster's law