Fixed PSR2 incompatable code