Fix wrong imports
Merge pull request #1427 from danieletorelli/master

Fix wrong imports