fixed bug, done?