Added code for David Nolen bug ticket