Fixed saving of empty pieces