Fixing overlay incorrectly calculating HS systems