Resolved #5404