25a6b2b fixed some issues