Core - bug fix responsive