Small bugfix update