Quick fix to 1.6.2