Fixed bug in modal popup