This solves some problems that have been discussed in the devel mailing list. btw: the hazel nuts were awesome!