P3 bug squash

Manuel Santos