Fixed Bug in Modals