Fix issues#(20,19,18,17,13)