Minor enhancement/bug fix