Fix FC #391