Fixes, thanks @cordoval