addressed issue #58