Restored linux compatibility