POC fix for issue #6