Improve previous commit to not rely on GCC