fixes #99 fixes #106 Reviewed-on: #103 Co-authored-by: paspo <paolo@asperti.com> Co-committed-by: paspo <paolo@asperti.com>