hackish but working fix for issue #61