Fixed an issue with the system