Fix for #36