OP-1660 Handle fix, was cropped