Fixed issue and changes