Make it work for dev.