Pr/fix 432

Fix #432 
If you like, revert, test it deeply, and merge. Unfortunately at the moment I do not have much time for it.