fixes #93 #86 Reviewed-on: #94 Co-authored-by: paspo <paolo@asperti.com> Co-committed-by: paspo <paolo@asperti.com>