Fix #2549

Fix #2549