Manos Chorianopoulos

push crash fix