Enhance the Jumbotruc (sic) fixes #3