Additional fix for #23