Major bug fix
12 Jul 3:00