more changes for issue #58