shuffle some more code around to prevent crashes