fixed to work with Express 4