issue fixes