Fix for #76