Fix #516