Fix #1404 - Spinner