Temp fix for bug