fixed 1st conditional