Fix for #55.