added additional safety measure, which we can remove when releasing