Fix for #23