Improve 2 Fix #22