Minor code improvement to match with new funtionality