Closes #148 - Don't remove buffered set versus call.