Fix FC #394