v. 2.3

Major bug fix