Small enhancement added