Worked around a little bug