Bugfix for old vs compilers