Fix before\simple & psr2