7_15 minor issue fixed