Partial fix for issue #68