Fix #479