Fixed for express 3.x