Fixes The Pendant of Performance, issue #64

Fixes #64