Fix #514