Fixed an issue with PSO