Can’t Exit Kodi 17 on Windows 10

On closing Kodi I click Exit and it freezes I have then to call up Task Manager and see Kodi not responding and close it from there.
Seems a lot of this about according to Google.
Will there be an update to fix this problem?
Thanks