Nasty workaround to fix #3
Once the core graphical work is finished. This is a high priority to solve.