close issue fixes