some bugfix..