Attempt #2 to implement issue #190

Python is hard.