Fixed orderable saving issue