correction 2 bugs