this fixes the frontend part for issue #2019