Bugfix for #359 – 2nd try