add fool-proofing