Fix to last commit, now it's almost work!