CONN-1143 Modal fix