Fix for #41