[KFSQA-783] May have the modal thing fixed...