Fixed 8880 bug