Fixes thanks to @xabbuh