FP-145: fixed