logic fix
logic fix