Express3

Fix for issues/387 and issues/405