Fixed copy&paste