I THINK this fixes the Kiha issue in #606