Thanks @juev
Small changes
Fix