Bug fixes. Working type origin operator ($).