Issue #425 removed commented lines