20140922 - Fourteenth commit for special case