fix for 0.6.3.1