Fix a hack line, add some hack. :)