Fixed 12302 bug