Changed code for higher coverage