Pr 8 update

Update @starcalibre's PR with one final fix