Worked around NaNs problem until we fix it