3.4.1 clean patch :)