Added fix for null bounds and corrected wrong draw