Fix for different systems