[#67] Handle CURRENT status the same way SAVED is