Slight change to try to avoid segfaults :(