Related to #1034