non-incremental timestamp problem fixed