Also fix this in ApplicationPage