Added possible work-around for g++ bug