OP-1222 Fixed stab layout.