Should fix #34 (Multiple Modals) without breaking anything...