Fixed fetch errors