MAL-32 | Fix for front end