clarified special cases in shorcutting and / or
relates #18