web commit by tuomov: patch..