Fixes #212 Huge performace gain!