Attemp to fix crashes