Fix #539