Changes for #Issue 59