Fixed save not being called