[master] Fix #1413