#5 correction bugs