Fixed problem with craching