Fixed bad merging of fix for #304