Reverted back to old behaviour