Address #92

/cc @mikesherov 
This method is very dangerous.