Fixed incorrect reconstruction of choice objects