Fix for #39