Fixed work on other platforms