fixed cap logic again..