Clean up on issue for issue #23

Makes this a flag to resolve issue #23.