PUll request: Hotfix update values

Closes #319