Fixed issue with  not working well