Fix for #126 as initially proposed by @bbrangeo; pushing for speed (since i need it.. :) )

Fix for #126 as initially proposed by @bbrangeo; pushing for speed (since i need it.. :) ) #102