#7 fix
Preparing for test
And fixed select