getting the update from master about the change of types

More strict types are better.