Fixing for #76