Added changes by @arthurnn
Forgot this one