To fix issues with save