getting rid of unnecessary query. re #280