Updated to fix the SQLite issue