fixed crash/bug