fix it with no more dependency on an external mojo.

Submitted by Stuart McCulloch