bugfixes... not working yet !