Created by: azriel91
This should address issue #356. However I haven't tested it on other OSes to ensure no regressions