Worked on #500 temporary fixe