Fixing behavior with #129