I think the AMS wallet had a similar problem a while back??   Since @keesdewit works on both wallets, he should have a good idea how to fix it.