fixed a critical issue