removed extra database call MJ-394