Fix #512