Fixed wrongly pre-filled values

Fixes #105