fix onactive error + gaye nitpicks round 3 :D