Fix #491