Tested on MacOS, but will try to patch this