Crash Fix

Closes #194