Added possible bug to investigate