still fixing entry guids