incomplete fix for issue #49...more coming