fr-2206 - Go to work on this.

more about : fr-2206