Crahing bug fixed :)