Some fix for modal