:D fixing stuff