Fix to issue #8 with modal window