so this will close bug #548 as well :)