am pm issue fix