Safer like that. Ref #11