fixed some final bug #1