Bug #3811 - Fixed import and nit