web commit by tuomov: More patch