fixing issue with saving via click