Updata as hrydgard' suggestion