Fix for #48