Fix #2162