Modal bug fixed