I fixed the solution setup. It's not that important, but like this it's more comfortable for the user.

Rejecting because no random tests. Please check if this documentation is any helpful, and create new fork with fixes.