big fix for #62