Workaround for eval function when all saving has finished