Address #92

/cc @mikesherov 
Just optimized this method a bit