Fix issue with references for the modal