fix dima bugs :)