fixed similar results for non beta users