crash behaviour

crash crash crash
merge fix