Partial fix for issue #13