fixed crashing bug??