Think this has fixed the bug close error