Commentd with the bug  (I believe) fixed