Change the way of making card available and bug fixed