Fix for other operating systems