fixed that nasty crash bug