most of fix
Fix #2