Fixed issues while modifying bill