20140922 - Seventh commit for special case