Temp fix for null interest bug