Try to fix the bug with the safe way