fix FS #581 (thanks to Markus)