fixing #240 for the frontend