last edit for fixes #73