Worked around Issue #216