Fix #553