Fix 'modal not responding bug' #2