Partial fix for issue #35