Changes for issue #32