Temp fix for last bug