Fix #555