bug fixed final #2