bugfix for recent commit