hum... fixing stuff.. maybe