Another attempt for 0.6.4 update