Fixed more on #559