You right. No need this hack. Look at new version of code.