Fixed Modal bug