Fixed an issue