update with bd50e57 bugfix