-fixing stuff