Additions for #514