Fixed save behaviour.