take precautions to prevent issue #365