Fixed a bug which caused the application to crash on test device