attempt to fix crashes