removed extra db call #2254