Fix for Modal