Workaround
Removed not working stuff.