Crash Fix

Closes #188