Bug fix with g++