Fixed save and play bug