Fix #544