First Version. Working with ugly workaround