clean-up for issue #63