Fixing issue related to removing too many spaces when having long subjects