fixed as per feedback