Temp fix for a bug