Fixed / worked around demo.