clean-up re: issue #27