Temp fix for release compilation