First Test Version minor bug fix