minor bugfix, preparing to merge