Resolving the FR #1322