fix from_system