Fixed issue PA-320