Added clarifications and support for an atypical case