1.2

logic fix