Workaround for local development