2 of 4 bug fixed