Cleaning up Mathias' mess ;-) part 2