Mklauser issue84 rebase2