Fixes: #2904 fixing 1.0.8 setup