935f74f latest fixes sugested by iuri