slightly better, small problem with months