Ideally we could get ride of this additional query.