Bug fix. production stage