add some hot fix