Frontend fix 3