Another try on a bugfix..