[#667 status:fixed]