Trying further fix for #41