Fix for #40