update with 7c395bf bugfix