Fix for #41