re #926 - Fixed regression after moving logic to the view class