Apply the same trick as #1241