BugFix
Merge branch 'modalfix'