Improve Fix #22