v 5.0.4 work version, fix bugs