fix last commits crash