Fixed "no row with given identifier" error