Bug fix. Need to test in production.