FIXING BUG MODALS