Fix for #55