Temp solution to static/public issue