revert the code to fix RuntimeException(it will be happened alway