adding fix by @jestho in local repos