Thanks for pointing that. I've tried to fix behavior which doesn't seem well to me bcs it can lead also to discarding values which where e.g. read from system and so on.

I'll update the PR.