Addition of safety feature. Resolves #1