Fix ClassCastException with Taming. Fixes #924