Supplementary bug squash to last commit