fixing stufff