fixing stupid mistakes T_T