Definitely fixed #5 and #6, and pushed it to all 3 releases