Possible close button fix (#30)