solving production mode bugs