Fix Bugs : Strict Standard