add PSR support, workaround for Html bug