[Fix Bug 997407, Fix Bug 997417] Create a Dinosaur.
review changes