fixed some save issue