Make the plugin works for 2.4