Fix for Dragon Riding.
TODO added.