Additional fix for #51