Fix to Jan Fiete's bug report