Fix FC #393