add feature suggested by Markus