plugin related fix