fix lockhack
save_ordered in controller
merge