Removed problem with picky compilers