Guides bug-fixes: issue #217