Fixed to work on all systems.