Hacking around for better performance (2x speedup)