Damn multithreading :) Issue #664