trying to fix crashes..