Fixing self caused bug