Clean up for issue #10