Fix for Db