More config workaround. 0.6.5