View handler fixed