Fix for #150