added fix for 24, not to be null