near final version
fix