Disable adding suffix on condition