Created by: meguiraun
I did not test properly my last pr, thanks @marcus-oscarsson for pointing out the issue.