Issue #85 , fix branch