Tring this again. fixes #3