Answers to issues #170 and #171