Fixed 5.0.2 bug