Small crash issue fix