Update and fix on Github