Already fixed, need to run a couple more tests before sending this to zapstore/app store.