There was a bug should to be fixed