Worked around massive bugs