Small bugfix, including test