fixed issues with save