Re-commit Dynamic Tank fix