Fixed issue with null short term boolean