* prep for port to 1.6