update #330 (not fixed) and cleanup example