@Andrea Boriero: I just tested with your changes and can confirm that it's working now. Thanks a lot for the super fast PR.