Additional bugfix for #2