artf661658: Bug fixing