Changes for #393