Fixed issue #326 (again, it was lost in a merge)