Band aid to temporarily fix #61 to prevent crashes.