Save answers fix