Task #0051: Make system fixed for mac.