This was taken from mentioned issue, but if you really think it's problem I can fix to the "proper" one...