Fixes #5

Probably needs porting to the new updater framework too ?