more fixies in this plugin