Fixes partly issue #10, still it is not updating