Sorry, I accidently based the last fix off the older code, ignore the first zipship_2.zip and use this one instead.

More...