quick fix against crashes